Revert 28f44b3..7bf777f

This rolls back to commit 28f44b388c6ab627268e72461898eeb8c4ffc3ad.