Revert 0a0a5be..2b069ee

This rolls back to commit 0a0a5be4edae6c698106ecb260096acde82e3a14.