Revert 21a686d..9fb77fc

This rolls back to commit 21a686d2543f1e9edefd94fc25be74990b0cf5c4.
Revert back, no success