Revert dcbab1a..0b1dac5

This rolls back to commit dcbab1a2fb772e0c3722e27703f48a5c9c322c67.