Revert 7ed6ac5..aee9c79

This rolls back to commit 7ed6ac58ef319905ea85a60d1cd545fade1a8e70.