Revert 044d235..c9c0a41

This rolls back to commit 044d235d2480cd499aeff9c7044ef8274839a815.