Revert 80161ad..ae7d15c

This rolls back to commit 80161ad49cff5709c0b5f1ded930c2643c50eb07.