Revert 5c5c253..e65e57b

This rolls back to commit 5c5c2533a85ad749de9edd6c1c1282ad6b0417a6.