Revert 9feb915..dc3a846

This rolls back to commit 9feb915f73696ed2451702bca5c7d90b8941a381.