Revert f54d386..04ea485

This rolls back to commit f54d38696bd0078ee907ad6865e3d29d408ce7eb.