Revert d19589d..11dcc54

This rolls back to commit d19589d6233ff291c4bc4bd5c77178fc32050598.