[layer23] Reverted commit ece1463...