Revert 6005197..3a0f18c

This rolls back to commit 6005197ab7c2dcc11f82c0bab7f35e9c56df569e.