Revert 48748dc..c673546

This rolls back to commit 48748dcd6948fc4585fd23b016a1a9ae0611e1d5.