Revert f3ec1b4..cde9729

This rolls back to commit f3ec1b47f66716d6c9b8064e2abdfde5cd4a2b95.