Revert 6a9a8bb..2c304d8

This rolls back to commit 6a9a8bb736478228597edf365bd5d9e63c8d77fa.