Revert 8c4d744..c1a595c

This rolls back to commit 8c4d744c09796c7fa84195a764ae5c670f8d4b9e.
Before rolling back