Revert 69c8d4f..ab4d1c7

This rolls back to commit 69c8d4f1f812753df6326db1e4a9d64832d026b9.