Revert 1e75352..44b6a84

This rolls back to commit 1e75352e5859c5ddf9039fe66a3bcb039b48b1c6.