Revert 23d3176..0fce0c1

This rolls back to commit 23d317690c1256cf9b6f73db62ce74a2f40cedea.
Revert 0fce0c1..130e84a

This rolls back to commit 0fce0c1b624e380ce2e73ab6518b963166b62548.