Revert 7a4ee3f..f2599a2

This rolls back to commit 7a4ee3f9fde6d89095511db277c090c0891281b4.