Revert 2e84ad0..d7b6d98

This rolls back to commit 2e84ad00f31fb112747e98a5bc125c43115754ea.