Revert 6a912eb..07c773f

This rolls back to commit 6a912eb1d5c2c5a9df7d1addc95032c9f78c45e1.