Revert 3eb4795..a33496c

This rolls back to commit 3eb47953b4995883173e8b26ff3de98d98704cb8.