Revert 5f5a332..de95112

This rolls back to commit 5f5a33200d618d3ef14e012c67185dee7bb67353.