Revert 0e38aec..1da3aa7

This rolls back to commit 0e38aec28388ffbd1c85c49c93253456ee62ede1.