Revert 9a00e87..9d657c3

This rolls back to commit 9a00e87e3a2f62e97137a9c06f08b6607c890494.
re