Revert b5a16e3..0e16b9d

This rolls back to commit b5a16e30498522a2ab249c574c3cf9ce3103aebf.