Revert fbcccee..48a4b52

This rolls back to commit fbccceec19bb60340a695f07bbb6f3c142b808c3.