Revert 4e5d75e..ae39158

This rolls back to commit 4e5d75ed4344bd62fbfc2612bcd4139a8ca0832d.