Revert 8661f0d..a61fb56

This rolls back to commit 8661f0d9070ec6651a89160fdedeb1b49f5335ce.