Revert b5ca6cd..c8d2a93

This rolls back to commit b5ca6cd0047f7574019afe9f7d881eb8d9f83b77.
up