Revert 905ae3b..aecff7b

This rolls back to commit 905ae3b337450a5c566046861abf01e1e6eb6eaf.