Revert 15bc656..57fe750

This rolls back to commit 15bc656997058648e0b80e8091f799671f9ef171.