Revert "Revert "Revert b052573..efce814""

This reverts commit aad3fca58da36c4360002a530b49bc29948d86f4.