Revert cae2b4d..b18c9ad

This rolls back to commit cae2b4d114770655953bc3102adbc1a1f8ef5303.