Revert 55488fd..0a5d649

This rolls back to commit 55488fdb7d59cd8f0e25eec1a3c206a5bef65b56.