Revert 87ba51e..b18fd9f

This rolls back to commit 87ba51ef712abc6a14451c9fad40c9530a8987e6.