Revert ac76ccf..b03dc28

This rolls back to commit ac76ccf8cca515a6d1c0314f6703486a881ca74a.