Revert "Merge branch 'bootstrap3'"

This reverts commit 10a789d1fe2542e1f1b1fd341429568d43da14ba, reversing
changes made to 0c06b6865e0e45b312bfd39be68c9107492a536c.