Revert f129b0a..eb644c2

This rolls back to commit f129b0ac69e7e3bab37eaa4514b8850d243bba38.