Revert 7a4c2ee..c326de5

This rolls back to commit 7a4c2ee3bbe099821883beb1b27a38c15b4069f5.