Revert 36e32ba..49a94e7

This rolls back to commit 36e32ba4ea3f781bc61cc3ab846470f50a3280d8.