Revert 77997d3..3ddf9ad

This rolls back to commit 77997d371a8f77ed1685ff7a3a375514a9c5bb8a.